From: David S. Miller <davem@davemloft.net>
Date: Sat, 4 Feb 2012 21:42:19 +0000 (-0500)
Subject: Merge branch 'master' of git://gitorious.org/linux-can/linux-can-next
X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~10^2~11655^2~390
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=d07d4c239bbf428db5581ccd5ca3770bbd15bfbd;p=linux-4.9.git

Merge branch 'master' of git://gitorious.org/linux-can/linux-can-next

Conflicts:
	drivers/net/can/usb/ems_usb.c

Minor dev_warn --> netdev_warn conversion conflicts.
---

d07d4c239bbf428db5581ccd5ca3770bbd15bfbd